merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 8 Sep 2010 04:08:19 +0000 (13:08 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 8 Sep 2010 04:08:19 +0000 (13:08 +0900)

Trivial merge